Auto merge of #4584 - alexcrichton:beta-next, r=matklad
authorbors <bors@rust-lang.org>
Fri, 6 Oct 2017 07:38:28 +0000 (07:38 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Oct 2017 07:38:28 +0000 (07:38 +0000)
commit3423351a5d75ac7377bb15987842aadcfd068ad2
tree39a05c758d9eb32f7186688e4adbe1557283dedb
parent5068cb606aadb5e70238a3a52e52749f21b11055
parentf0a52633b06011ff811c41cc99b35456d67e023d
Auto merge of #4584 - alexcrichton:beta-next, r=matklad

[beta] Fix [patch] causing updates with a virtual manifest

This is a backport of https://github.com/rust-lang/cargo/pull/4583